From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Fri, 1 Sep 2017 09:06:21 +0000 (+0200)
Subject: mm: don't request scrubbing until dom0 is running
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1504
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=2483ec0c6805f54317d793c3a18ab3b55619c4ad;p=xen.git

mm: don't request scrubbing until dom0 is running

There is no need to scrub pages freed during dom0 construction since
once dom0 is ready the heap will be scrubbed by scrub_heap_pages() anyway,
setting scrub_debug at the end.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 2b8bb95369..dbad1e1ca0 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -2248,16 +2248,12 @@ void free_domheap_pages(struct page_info *pg, unsigned int order)
 
             spin_unlock_recursive(&d->page_alloc_lock);
 
-#ifndef CONFIG_SCRUB_DEBUG
             /*
              * Normally we expect a domain to clear pages before freeing them,
              * if it cares about the secrecy of their contents. However, after
              * a domain has died we assume responsibility for erasure.
              */
-            scrub = !!d->is_dying;
-#else
-            scrub = true;
-#endif
+            scrub = d->is_dying || scrub_debug;
         }
         else
         {